Fix some bugs, update tests

1 files changed, 25 insertions, 25 deletions

diff --git a/tests/cassettes/test_media_post[False].yaml b/tests/cassettes/test_media_post[False].yaml
index 1e724c7..de433e9 100644
--- a/tests/cassettes/test_media_post[False].yaml
+++ b/tests/cassettes/test_media_post[False].yaml
@@ -1,11 +1,11 @@
 interactions:
 - request:
     body: !!binary |
-      LS1mZGUzMDBkMDY1Yzk0MWNhYTFlOTUwMDQ5NzY0ZmU0NA0KQ29udGVudC1EaXNwb3NpdGlvbjog
+      LS01ZDQ4ZDVkOGNmZWY0YjU5YWEyZmQwZTQ5MDM5NTdlOA0KQ29udGVudC1EaXNwb3NpdGlvbjog
       Zm9ybS1kYXRhOyBuYW1lPSJkZXNjcmlwdGlvbiINCg0KSm9obiBMZW5ub24gZG9pbmcgYSBmdW5u
-      eSB3YWxrDQotLWZkZTMwMGQwNjVjOTQxY2FhMWU5NTAwNDk3NjRmZTQ0DQpDb250ZW50LURpc3Bv
+      eSB3YWxrDQotLTVkNDhkNWQ4Y2ZlZjRiNTlhYTJmZDBlNDkwMzk1N2U4DQpDb250ZW50LURpc3Bv
       c2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9ImZpbGUiOyBmaWxlbmFtZT0ibWFzdG9kb25weXVwbG9h
-      ZF8xNTI1NTY4MzgyLjMzODk1NDRfUjBIVTFTUEZSUC5qcGVnIg0KQ29udGVudC1UeXBlOiBpbWFn
+      ZF8xNTI1NjQ2NTMwLjA3MDM0NDJfSlNCVUpUU0RENS5qcGVnIg0KQ29udGVudC1UeXBlOiBpbWFn
       ZS9qcGVnDQoNCv/Y/+AAEEpGSUYAAQEBAEgASAAA/+ICHElDQ19QUk9GSUxFAAEBAAACDGxjbXMC
       EAAAbW50clJHQiBYWVogB9wAAQAZAAMAKQA5YWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
       AAAAAPbWAAEAAAAA0y1sY21zAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -941,65 +941,65 @@ interactions:
       YjcPbiv3elShfkRBtkgMCmGlSoojqYg3CP1hg5XagwuSZZej1N96VKgeHKRZSii9BM7fep2iK8u6
       Y69PxSpUVZtsdoSiQO3N/mozLhcIxMSN89s+KVKgU4XMHLHOFF7LVZRJrFV22pUqBoKKIKucrmmT
       AxMZfilSoFO2xicuMnjFStYMZkHV3XP4pUqC5Zbdy3MwJvu7U0AjASTLfOy9aVKgjPC5Yj9imCTI
-      jyrGTjBn9aVKgY09xujjo55uzvSpUqD/2Q0KLS1mZGUzMDBkMDY1Yzk0MWNhYTFlOTUwMDQ5NzY0
-      ZmU0NC0tDQo=
+      jyrGTjBn9aVKgY09xujjo55uzvSpUqD/2Q0KLS01ZDQ4ZDVkOGNmZWY0YjU5YWEyZmQwZTQ5MDM5
+      NTdlOC0tDQo=
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
       Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
       Connection: [keep-alive]
       Content-Length: ['53645']
-      Content-Type: [multipart/form-data; boundary=fde300d065c941caa1e950049764fe44]
+      Content-Type: [multipart/form-data; boundary=5d48d5d8cfef4b59aa2fd0e4903957e8]
       User-Agent: [python-requests/2.9.1]
     method: POST
     uri: http://localhost:3000/api/v1/media
   response:
-    body: {string: '{"id":"52","type":"image","url":"http://localhost:3000/system/media_attachments/files/000/000/052/original/3d84f8964af77003.jpeg","preview_url":"http://localhost:3000/system/media_attachments/files/000/000/052/small/3d84f8964af77003.jpeg","remote_url":null,"text_url":"http://localhost:3000/media/UBwP2uqaf6mq267w2hU","meta":{"original":{"width":600,"height":600,"size":"600x600","aspect":1.0},"small":{"width":400,"height":400,"size":"400x400","aspect":1.0}},"description":"John
+    body: {string: '{"id":"4","type":"image","url":"http://localhost:3000/system/media_attachments/files/000/000/004/original/b20cd768b6c6dc3f.jpeg","preview_url":"http://localhost:3000/system/media_attachments/files/000/000/004/small/b20cd768b6c6dc3f.jpeg","remote_url":null,"text_url":"http://localhost:3000/media/ieYadbDjrrB8NdSb4Jk","meta":{"original":{"width":600,"height":600,"size":"600x600","aspect":1.0},"small":{"width":400,"height":400,"size":"400x400","aspect":1.0}},"description":"John
         Lennon doing a funny walk"}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"722409576f1f39995d8b4412eef4d6f7"]
+      ETag: [W/"35e4bbb8edb33f87e63136f6df1410bd"]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
       X-Content-Type-Options: [nosniff]
       X-Frame-Options: [SAMEORIGIN]
-      X-Request-Id: [86f71ed5-de96-4ca1-b31d-ffedd817a6c3]
-      X-Runtime: ['0.222089']
+      X-Request-Id: [1e8f2128-3a2e-4f7f-bf18-bf300356e64c]
+      X-Runtime: ['0.236498']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['507']
+      content-length: ['506']
     status: {code: 200, message: OK}
 - request:
-    body: media_ids%5B%5D=52&status=LOL+check+this+out
+    body: media_ids%5B%5D=4&status=LOL+check+this+out
     headers:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
       Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
       Connection: [keep-alive]
-      Content-Length: ['44']
+      Content-Length: ['43']
       Content-Type: [application/x-www-form-urlencoded]
       User-Agent: [python-requests/2.9.1]
     method: POST
     uri: http://localhost:3000/api/v1/statuses
   response:
-    body: {string: '{"id":"99979649522941549","created_at":"2018-05-06T00:59:42.625Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99979649522941549","content":"\u003cp\u003eLOL
-        check this out\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99979649522941549","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+    body: {string: '{"id":"99984771013851445","created_at":"2018-05-06T22:42:10.374Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99984771013851445","content":"\u003cp\u003eLOL
+        check this out\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99984771013851445","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
         test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
-        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","followers_count":0,"following_count":0,"statuses_count":129},"media_attachments":[{"id":"52","type":"image","url":"http://localhost:3000/system/media_attachments/files/000/000/052/original/3d84f8964af77003.jpeg","preview_url":"http://localhost:3000/system/media_attachments/files/000/000/052/small/3d84f8964af77003.jpeg","remote_url":null,"text_url":"http://localhost:3000/media/UBwP2uqaf6mq267w2hU","meta":{"original":{"width":600,"height":600,"size":"600x600","aspect":1.0},"small":{"width":400,"height":400,"size":"400x400","aspect":1.0}},"description":"John
+        Lennon","locked":true,"created_at":"2018-05-07T00:38:05.405Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","followers_count":0,"following_count":1,"statuses_count":2},"media_attachments":[{"id":"4","type":"image","url":"http://localhost:3000/system/media_attachments/files/000/000/004/original/b20cd768b6c6dc3f.jpeg","preview_url":"http://localhost:3000/system/media_attachments/files/000/000/004/small/b20cd768b6c6dc3f.jpeg","remote_url":null,"text_url":"http://localhost:3000/media/ieYadbDjrrB8NdSb4Jk","meta":{"original":{"width":600,"height":600,"size":"600x600","aspect":1.0},"small":{"width":400,"height":400,"size":"400x400","aspect":1.0}},"description":"John
         Lennon doing a funny walk"}],"mentions":[],"tags":[],"emojis":[]}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"c2a4071898220c1c166eea266e238832"]
+      ETag: [W/"de596385b2b69d373c05a83370f0664e"]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
       X-Content-Type-Options: [nosniff]
       X-Frame-Options: [SAMEORIGIN]
-      X-Request-Id: [f7b6f4cc-4f9f-445d-ac6a-66ca99c52d38]
-      X-Runtime: ['0.144985']
+      X-Request-Id: [8038ac24-ef93-4eba-ae80-0104d0e74046]
+      X-Runtime: ['0.145034']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1922']
+      content-length: ['1919']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1011,19 +1011,19 @@ interactions:
       Content-Length: ['0']
       User-Agent: [python-requests/2.9.1]
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/99979649522941549
+    uri: http://localhost:3000/api/v1/statuses/99984771013851445
   response:
     body: {string: '{}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"2a033721a88d32c869f00d6ca405183a"]
+      ETag: [W/"8a54bafe6bc3420cfd204adda95a1ad8"]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
       X-Content-Type-Options: [nosniff]
       X-Frame-Options: [SAMEORIGIN]
-      X-Request-Id: [58ab7405-16e9-4027-a680-51b6c4061f58]
-      X-Runtime: ['0.067701']
+      X-Request-Id: [61123c7d-c04c-464d-a8d0-8cb13825fad4]
+      X-Runtime: ['0.151311']
       X-XSS-Protection: [1; mode=block]
       content-length: ['2']
     status: {code: 200, message: OK}